From 95173747c17dbc630447334531ebbeea607e23c0 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 16 Oct 2013 23:56:51 -0400 Subject: [PATCH] * lisp/progmodes/sh-script.el (sh-find-prev-matching): Disable SMIE's forward-sexp-function while we redo its job. --- lisp/ChangeLog | 5 +++++ lisp/progmodes/sh-script.el | 1 + test/indent/shell.sh | 6 ++++++ 3 files changed, 12 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 843f5bbdd9c..82742f51340 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-10-17 Stefan Monnier + + * progmodes/sh-script.el (sh-find-prev-matching): Disable SMIE's + forward-sexp-function while we redo its job (bug#15613). + 2013-10-17 Jay Belanger * calc/calc-comb.el (math-prime-test): Don't assume large integers are diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index ec73a06955c..f834d7f3217 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -3097,6 +3097,7 @@ This takes into account that there may be nested open..close pairings. OPEN and CLOSE are regexps denoting the tokens to be matched. Optional parameter DEPTH (usually 1) says how many to look for." (let ((parse-sexp-ignore-comments t) + (forward-sexp-function nil) prev) (setq depth (or depth 1)) (save-excursion diff --git a/test/indent/shell.sh b/test/indent/shell.sh index 790656501d1..e402398b996 100755 --- a/test/indent/shell.sh +++ b/test/indent/shell.sh @@ -5,6 +5,12 @@ setlock -n /tmp/getmail.lock && echo getmail isn\'t running # adsgsdg +if foo; then + if bar; then + toto + fi +fi # bug#15613 + case $X in foo) do_something -- 2.30.2